Merge "Refactor MaintenanceTest to use a base test case"